Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Fri, 25 Jun 2010 12:11:51 +0000 (12:11 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Fri, 25 Jun 2010 12:11:51 +0000 (12:11 +0000)

Trivial merge